From: Philip Withnall <withnall@endlessm.com>
Date: Fri, 19 May 2017 09:11:35 +0000 (+0100)
Subject: lib/remote: Fix compilation with --enable-experimental-api
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~36^2~79
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=1feda846efe1b4848ebfb00a2a3a9d625b4d7edc;p=ostree.git

lib/remote: Fix compilation with --enable-experimental-api

The whole ostree-remote.h file is only included in the public ostree.h
header if OSTREE_ENABLE_EXPERIMENTAL_API is defined, so there’s no need
to change the set of methods defined in it according to whether we’re
compiling with experimental API.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

Closes: #875
Approved by: cgwalters
---

diff --git a/src/libostree/ostree-remote.h b/src/libostree/ostree-remote.h
index 5505bc1d..96fd4556 100644
--- a/src/libostree/ostree-remote.h
+++ b/src/libostree/ostree-remote.h
@@ -48,17 +48,14 @@ G_BEGIN_DECLS
 typedef struct OstreeRemote OstreeRemote;
 #endif
 
-#ifdef OSTREE_ENABLE_EXPERIMENTAL_API
+#ifndef __GI_SCANNER__
 _OSTREE_PUBLIC
 GType ostree_remote_get_type (void) G_GNUC_CONST;
-#else
-#ifndef __GI_SCANNER__
 _OSTREE_PUBLIC
 OstreeRemote *ostree_remote_ref (OstreeRemote *remote);
 _OSTREE_PUBLIC
 void ostree_remote_unref (OstreeRemote *remote);
 #endif /* GI_SCANNER */
-#endif
 
 _OSTREE_PUBLIC
 const gchar *ostree_remote_get_name (OstreeRemote *remote);